- various fixes and updates