fixed several small issues