working to clear up more warning/errors