Fixed EVERYTHING

Signed-off-by: Martin Grönlund <martingronlund@live.se>
FIXED MOAAAAAR BAWGS

Signed-off-by: Peter Mårtensson <veritas.is.me@gmail.com>