- added support for scheduling pushes
- some clean up