general clean up. sending out beta to testers tomorrow (03/11).