Fixed many... many bugs