remove useless var collecting
fix instance call
various fixes