temp fixes and changes