removed some diagnostics, random fixes