Various fixed and changes