added grid creation logging
fixed tests
some cleanup