style/markup updates and bug fixes