More keywords, better organization, added puncation/operator detection.

As title says :+1: