fixes to main/