fixed minor bugs throughout entire project