Changed around a bunch of stuff

Signed-off-by: deathrat <deathrat43@gmail.com>