Some little API corrections, implemented everything except grade_container