Dev 0.8.6.1

updates and cleanups