Updated makefile and made most stuff pass lint checks