Fixed issues 1-2 and issues 4