bugs fixed
new bugs