fixes, better live integration