fixes in main