small cleanup/mods