some fixes but still no dice