fixed some things, created more problems