renaming some things + minor bugfix