v0.2 sent to fab

minor rearranging, relabeling, etc.