[hw_4] massive fixes