added structure

small fixes