debugging
fixed
some tests&structrue