Feature design bugfix

Fixed a few of the bugs I found in the latest feature-design and was able to fix myself.