added lists and other tweaks