couple of fixes

reverted to 0.95 for compatibility with Wax. Fixed a bug.
May have introduced new bugs - not tested properly yet!