Cleanup + random changes, Might have just fixed down conversions :P

Signed-off-by: Captain Shadows <captain_shadows@aol.com>