fixed a couple bugs. tested and working
Authored by: Marcus Kellerman 2018-09-25
Parent(s): [193cd3]
Child(ren): [355f66]