0.0.2: Several fixes