Deep dive

General tweaks