stupid fixes after testing