Added in some new features, and added in a few minor fixes