all updates except text floating in statement box
niggly bits
merge conflict stuff
fixed mergeconflicts