fixed some mistakes, added new content