Fix a couple of bugs and add live checker