Fixed a couple o' things, Broke a couple o' things

Signed-off-by: ShadowChild <shadychild12@gmail.com>