bugs worked out for final