lots of problems fixed, thanks Henry