lots to fix