add rf stuff; add power stuff; some cleanup