Debug mostly

and some changes required for.gitignore to work. I'll add the deleted
files later