Feature/bbf 16#1

These are come errors noted in the code that needed to be fixed.