fixes.
structures improvements.