critical fixes -- need cleanup