fixed more minor issues