Fixes to work with new range seperator + cleanup