tried to fix some errors, again...