updated style; reworked entries