fixed some things since the last time