Adding some more features.

Signed-off-by: Liam M <archimedespi3141@gmail.com>