transaction loading refactoring; fixes market avg_price_1h issue
merged remote changes