added fixed several small issues