Update fontawesome and makeapi stuff, fix a couple of things after testing with makeapi