Fix up a bunch of issues.  This should fix epicbastion's problem honestly.