Some editting and debugging