corrected some minor errors
more like old version