Updates

Features, fixes & improvements.