fixed some problems and made some things better