Feature/bip21 - some changes

@yemel, I reviewed this and added some changes I think might be slightly beneficial. Good work though.