Fixed everything in the last commit
AND RECOMPILED :|