Final changes before presentation. Minor fixes and implementations.

Signed-off-by: Stanley Lai <stanleylai.sg@gmail.com>