Small changes and additions