bug fixed and all