last fixes making it work