fixes to master