cleanup, mods & fixes