changes from Friday

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

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