General tweaks all around.