fixed some things up