lots of changes. mostly styles