Improved book-keeping for grading and force resolution. Should conserve space better + fix a problem reported by a user