* Bug fixes and improvements