bug fixing Highlights