edits based on rvandernicks feedback
more edits for great justice