Some minor fixes, just cleaning stuff up
I'm Taconut, not alex_000