fixing the stuff from apr2
fixed stuff from april 2
tried to fix things from apr2