several fixes & styles