Minor cleanup and release 0.8.7!