dependencies
various fixes and additions