bugfixes and .gitinore