updated and fixed hash references