Fixed some stuff, thanks to @Walkman100 .

Signed-off-by: Tristan B. Kildaire <tristankildaire@gmail.com>