Daily 007

Small tweaks and additions