refactor and fixes columns computations
fix specs
fix specs