progress...
fixed some mistakes