Various changes, this is pretty bad

Signed-off-by: Ricky Elrod <ricky@elrod.me>