Lestewar cdmurph2 fixing bugs