styling and misc fixes