renames some stuff
merges with master, resolves conflict