working up test app and other tweaks