more work on preprocessor
added more paragraph types