Fixed some issues.
...