better schedule and more small edits
merged from pull