some minor issues fixed