mostly working, before getting into many signals
some cleaning