added references, did some tweaks @ev