added/changed a few minor things