Should fix some main issues