Finish the software, with a little bugs