Updates

Some post-HackTech changes.