Added answers, minor tweaks