switch to warning
minor cleanups