more last minute fixes...