changes
fixed several bugs