final final commit, fix some minor make errors