Add dtor
Remove some pesky dots