fix 0.006b

Make more code fixes