added options page and some fixes