fix bug: only numeric variables allowed -> also allow integers
some cosmetics