cleaning up some sidebars a bit; getting ready for other people to fork code