revised some things and cut off the fat
fixed stuff