very last fixes, seriously