Yes on both counts----this week----I do have some parts coming from Ruth to help a sticky airvalve issue on the front servo. But, yep it's doing both. I'm not making any promises for next week though! PS, I haven't forgotten your battery covers, work is being most inconvenient at the moment... All the best, SD-