final changes, corrected some stuff