Fixed some dimensions and added comments
Fixed conflict