reorganize and small corrections