better module detection, strip comments, add bin