reorganising stuff and adding missing fragments