Fix bugs; replace keywords; improve configuring