Registration + minor changes.