cleanup some jank
remove unused cert thing
fix issue with calling #value twice
incorporate some of spike's stuff