various fixes, minor feature updates