new style + fixes