Some fixing and testing