Signed-off-by: Ivor <vanderhoog@gmail.com>
minor bug fixes
minor bug fixes