minor beta bugs fixed