fixed some things?