small fixes, renaming