bugs fixed
fixed bugs