Fixed many bugs from last push