Serveral improvements