Added shorthand incrementation and changed parsing of methods to catch more.