update refactor styling. bug fixes.