Hackathon 2ns edition and some minor fixes