fixing singleton errors in the app