Fixed most of issues