Implemented more parsing and modified readme