fixes and removing flag