small fixes: indentation, trailing white-space, hexagon issues..