adding vim folds for readability, cross-plat cleanups