more updates and fixes on checkout block