More features, more fixes