gitignore updated and some changes -> not finished