Both centering added (att #2). Some copypasted code in hankel.c has been

eluminated