fixed minior bugs