17th commit: minor changes