some minor updates and renames