Added B-W fits, cleaned up