some tweaks, but can't reproduce hard return bug yet