bugs cleared and enhanced.