Completed to v6.2.8

Some minor fixes, making it a little bit more hungarian :-)