corrected some errors
Changes again
merging osborn's with mine
Trying to commit again
trying to commit a second time
trying to merge stuff
merged and modified