Fixes and feature