added some and fixed column mix-up