Changed watched-blocks configuration format from <blockid>:<blockdata> to <blockid>,<blockdata>.

Also tidied up some code, minor things.