bug fixes. Still broken