Made some fixes, commiting to test branch...

Signed-off-by: Scott Robertson <scott_robertson@ladybug-tech.com>