added a bug and a feature request