SLN fixes, better .gitignore
Merged