editor adaptions/bug fix