various tweaks and additions, gitignore fix