Fixed some functionality and tyling bugs from the merge and performed final tweaks
Merge pull request #3 from drewbot/drew

I fixed some bugs from the merge and made final tweaks. Also, 3D!!