Cursor "pointer" used where needed, Cleanup of commented code.