Add more options and update README