More features and a bug fix