final bug changes