Minor edits, setting up...