FIXED EVERYTHING. I have no idea what I'm doing.

Signed-off-by: Cesar Andreu <cesarandreu@gmail.com>