renamed state files
squashed some ugly bugs