Issue #101 fixed, pending verification
Issue #105 - fixing in progress, needs styling