Cleaner/shorter makefiles. Minor changes.