Adds/Changes

* a few changes here and there nothing major