1, 2, and part of 3 done for general project cleanup issue