corrected some things that were wrong...