Final updates

Signed-off-by: Vincent Lau <vincent@paywhere.com>