adding in std registration, some fiddles in other files