Small changes

see main file for more infos