more parsing and little fixes