small fixes & formatting