Hackathon2 changes

various