Status implementation + whitespace cleanup

Now running prove -bvpw is ok, also.