Fixed additional bugs; Bumped version to 0.0-13