Minor additions and changes during implementation