Some style changes, also closes 83, closes 84