More fixes , v0.01 works