fixes#7 fixes#8 and several bugs were fixed