fix issues 1-4