A general update to add a few features and fix a few bugs.