worked on several bugs