Some small bugs are fixed;