Resolved some issues I noticed.

Errors were occurring, resolved them :)