Bugfix attempt and added some untracked files