New features, little fixes