many more fixes to come