Find some bugs and fix it.