fixing basic issues