organized, fixed errors