Miscellaneous Update

I haven’t committed in a while, so this includes several new features.