small improvements & WFLY demo patch