cleanup

comment out Debug() lines
rearranged listen()