added where we meet and cleaned things up a bit