useless reorg & bugfixes