lots of cleanup, added more fluent helpers and got demo working better