Fixes and tweaks for Hackathon branch