More minor fixes/added mystery for suspense.