London hackathon

missing pieces and few fixes