Fixed bugs and made content changes