added changes from last night

Signed-off-by: Jason Kuster <unexpectedapocalypse@gmail.com>
Merged

Signed-off-by: Jason Kuster <unexpectedapocalypse@gmail.com>