Removed some blocks of commented code. A few bug fixes.