Some minor additions. Will rebase

Signed-off-by: Pieter Willem Jordaan <pieterwjordaanpc@gmail.com>