A few fixes and updates (;