Updates/fixes.
Implemented a few features, and reimplemented a couple.