Some fixes, still doesn't work on my RPi though D:

Signed-off-by: C5E3B7BD (Will Apodaca) <C5E3B7BD@gmail.com>