minor changes and renames