FIXED the odd parsing errors when looking for matches, added drawing commands