First pass at fixing features

Change-Id: I55cbd19fec9c13f585a18a221403ad05b94d8569
Signed-off-by: Ed Warnicke <eaw@cisco.com>
Signed-off-by: ylhsieh <ylhsieh@itri.org.tw>