fixed a number of issues
small issues