Fixed typo, cleaned up todos and shortened message.