Typo, bug clean up.