added device scaffold. cleaned up some spec comments.