By Mike Whiteley/Noel Grandin, some smaller changes by myself; changes to binfilter removed from patch