Fixs lots of comm bugs