fixes and improvements for schedule plugin