Added comments, added watch file, added reorder