Add a lot of stuff and correct bugs.