various fixes and small changes