sd
jd
fixes
fix
final hackathon commit - some fixes needed