fixing minor bugs and a few user requests