Made some proposed fixes.