bugs & fixs