various fixes from first live debugging