fixed some docblocks
use scheduler where possible
integration of the scheduler and new quota mechanism