last fixes hopefully