minor changes #3
more types #3