draft. bug fixes