Added comments, additional testing features

Signed-off-by: Kolijn Wolfaardt <kolijn.wolfaardt@gmail.com>