Adds/Changes

* a couple bug fixes, a few more found will fix those later