fix lots of issues"