changed focus and tweaks