fixes from poc