topology added. some fixes