fixed a few bugs;
fixed a few bugs;