Add more options; fix bugs.