Fixed drawer. Some cleanup.