Cleanup and stuff. now in beta status...