Bugs worked out