fix serv has correct deb name; check-sanity script

and code refactoring