so many things... cleaned up, bugs fixed, etc