cleanup and a few fixes. #288
update changelog