some misc fixes and a failing test, providing direction for future work
some misc fixes and a failing test, providing direction for future work

Signed-off-by: Ryan1729 <94d48eb26deaf2479098821c91f188298c441e83@gmail.com>

Ryan1729/zark-city