Multiple features (and bugs) added