AJ-340 AJ-341

I have patched with my own reported issues.