fixed some problems, found some more