renames and other minor stuff