Fix bugs, enhance features