Minor changes and adds