Working make system, fixes, additions