Some bug fixes.. more TODOs to come

Prepping ish for a new release. Relatively stable and need to get some
of these fixes out ASAP