tweaks. this one doesn't use IDA
merged