Make makefile faster
More ms edits