cleanup most warnings; removing unused imports
update blocks and items