Minor edits to Core
Minor edits to payload module