fews improvements, still lot to do :D