fixes after testing, #1