features, fixes...