Fixed some cosmetical changes