Fixes and feature.