improve --devel switch