few fixes, commmented out cache