add margin, small fixes