fixed coms and logic stuff