style update / fixes