Fixed majority of issues from last pull request

Bam, that's everything.