slight tweaks on features

Signed-off-by: Suhayb El Wardany <me@suw.me>