alot of fixex. Going to version 0.0.2