Make it a little easier to read.
Moved old parsers into lib also
Make function error on incorrent number of arguments
Make simple dot work