Added break for the switch clause and changed the erronous calls to todo comments
merged junhao into master