fixed some bugs
fixed width