Fix bugs, bump version to 0.0.4