fixed some things up....