some small fixes / cosmetics