fixes and new main