Add in logs and misc tweaks