final fixes: it works :)