Various adjustments preparing for beta testing
Various bug fixes and improvements