Structure exceptions, more style tweaks