Finished beta features
Numerous bug fixes and tweaks