Large updates

Signed-off-by: Thomas Seng Hin Mak <makzan@gmail.com>