fixes some display issue, makes some minor improvements