fixed improper list handling etc.