fixed some problems, found others