minor improvements
minor refactoring
various fixes
update dependencies