added some future structures, fixed diagnostic stuff