working to fix issues