Properly update on status change. Other cleanups.