small cleanup
updated to 0.8.7