updates to fix various problems