cleaned up some comments and made the marker folds more compact