Add: minor fixings and changes.