Fixed some issues.

6 files changed