last fixes I hope