some rearranging, slight fix to gitignore, and input support (no settings save/load yet though)