Code ready for beta release

Updated and tweaked a lot of of stuff.