fixed more of danny's issues