0.0.5a

Some additional fixes