Remove comment
Fix some critical issues