Remove border; bugfixes