fixing bugs
fixed options stuff and other bugs