Added some FIXME comments to previous changes
Whitespace trimming
layout
update