More bugs fixed. Made special delimiter characters work