more fixes to hybrid model. becoming more rangeset again but cleaner