christian
update refs
update stuff
merge