Fixed some behaviour and standarized