Reorganized set/get + README fix