Stpatrick923 trigger

Trigger, goal, doors, etc. redone according to Raja's specifications.  I think.