bug fixed and more