Fixed things that were different between my fork

There were several things different between my fork and the master that
i didn't modify, not sure how that happened. Now fixed.