adjusted all else statements and added hints