pic, bug fixes