Fixed bugs, refactored.  Looking good =)