Adjusted some things to 2.0, fixed formatting and statuses