some minor issues are fixed