-final bug fixes (hopefully)