fix some minor things
some more changes
Dead code removal
less lead space