update to latest Om and fix bugs