update with recent fixes