Fix some bugs wow whoa many bugs doge