hopefully fixed some things