Fixed a few bugs and added a few schedule option options