minor changes from client feedback