Update default build, close #3, close #4, close #6, close #7