minor fixes
working on errors/warnings