Some little API corrections, implemented everything except grade_container
Merge commit '32fbae37d143d81c7ff54fc499798d34b5392040'
Minor code update