It's okay. This is easy to fix. :) I'll probably take these changes, make sure they work on my system, and if they do, go through and remove commented lines. Let's see what Travis says about these changes. I'll accept them either way probably since they simplify, but I'm curious to see.