Fixed up a few details