small fixes and renames.