merge and small visaul fixes