r16 beta + personal edits