Added missing each and rearranged components.
Removed fixme