Extra tweaks and polish. #208