0.95 beta - latest stuff