style + fixes