Update of position after inserting image should
include possible space after paragraph.
Update formatting. Remove some out-commented code.