Minor Fixed

*Gone through and got rid of lots of //TODO's - setBlockWithNoitfy
*Few other minor changes