fixed some left over stuff from old structure