fix administration & combine files