fixing some issues.  ya know