Added additional parameter extraction for inline commands, added multiple choice environment, cleanup.
Minor changes for tikz image serving.