A bunch of other new things/bug fixes