add X11 linking
use map for features, add comments