Added some options and more achievement work.