Alvin's debug fixes
Merge pull request #1 from omgimanerd/master

Debugging