fix #52 and do general improvements to contributions