more fixes, version, changed RAF shim again,