cleaned up code; overhauled parsing engine to handle shorthand delims