fixes after hackathon