finished clean up and known bugs. Ready for testing.