Features and fixes (working rev)