Fix some bugs and make it official