fixed some obvious mistakes...