A bit more here and there

Signed-off-by: Kenneth Lim <kenlimmj@gmail.com>
More, more!

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