all the fixes for realsies this time