minor refinements
update .gitignore
First optimisation efforts