Fixing some config issues and ready for showcase