lots of changes; fixed overlap
looking OK
looking better