minor modifications for v0.1