Fixes and more fucking fixes

Signed-off-by: dgfrancisco <yo@dgfrancisco.com>