Fix issue with runtimepath not including some default paths and fix some formatting