corrected some obvious bugs