Dev. checkpoint: typos, further implementation.