JS protocol rearrange and touch ups