fixed formatting and parsing