states + fixes