Working on a few todos in the styleguide