fixed Garret errors(not assign structure)
fixed assign structure
more Garret error fixes
test cleaning