cleaned up project, ready for continuation