samll bugs fixed