More work... mostly stylistic
More functionality updates...