Misc bug fixes + feature updates