Bug fixing and generally trying to sort out oneye's problems. Some experimental stuff.