Fixes for gigantic addition of everything from before

Signed-off-by: MassStash <MassStash@gmail.com>