reorg and few corections