Changes.
Fixes & cleanup.