refactored a bit parsers
updated readme