fixed some structure issues