some fixes at the beginning of hackathon