some fixes and renames