Fixed issues 2 and 3.