Bug fixes, widget work, paa improvements