simplifying features, stability improvements