Misc. fixes...happy path now works.