improvements according to buglist scene 2