Fix initial message bug, some code cleanup, removed debug messages…  #1