Some bug fixes and a few small feature requests!