Fixed Makefile, began inlining init routines.