Fixed some undefined issue, and improved cover size