Fixed last minuet bugs