some work
fixed a bug