last bug fixes