Some fixing and tunning