Spotlight & Dog Ears

Fixes for #11 #31 #77

Quite a lot of changes around here, so would be good to get a beta version out and get people testing it.