Fixed some more tabs to spaces, and moved everyone? over to using the reformatted basis structure.