cleaned up repo, added more stuff, still tweaking template