some bugs fixed, borders improved