fixing bugs
clean up