fix references, improve ::create