rearranged comments, cleaned up stuff, and added makefile :construction_worker: