added options and edited names