fixed some things...