fixed some things: