fixed a few more minor issues