+lot fixes -still bad