last minute fixes!