Fix bugs and run