A bunch of bug fixes and feature updates