Max 60 second runtime Parser!
Updated a few tables, plus fixed bug #182