Basic bug fixes and cleaned up content