other fixes/testing