misc changes and features.