solved some bugs tag this as v1.2