fixed a few small bugs, switched to current term
Merge branch 'master' of github.com:buhhy/scheduler