Small tweaks, sprint with lshift