Cleared up project and add new fixes (6-Aug)