various styling
improved parser
added options capability