fixed some typo/bugs with draft code. circa 2 more remain.