fixed and changed stuff