Minor changes and preparing for new focus-features