couple of features and typo fixes