Getting very close to first public beta. …

Getting very close to first public beta. Just a couple more things to fix.