Final touches
 Fixed up a few things