correct some format issues
Merge branch 'master' into wip-native-functions