fixed a couple of issues.