WIP: many style fixes/improvements