fixes as requested by Nick