a lot of problems fixed

aha