Latest minor changes and additions