Bug Fix and Payment Gate progress