Incorporated all of Kirk's edits. Seems to be working!