rm some olf commented out code
added check of argc