More work on editing and adding new bug