Many changes, most notably added basic marks support. Didn't change status bar yet though.