a couple of problems fixed