various fixes & styles