fixed some mistakes, development underway