Minor fixes (however bug in selection looks seriously)