Further annotations and tweaks on Thing