pic: bugs fixed