All round update and fixes

Signed-off-by: Kenneth Lim <kenlimmj@gmail.com>