protocol independent, layout improvements
clean up pre release