Fixed small escaping bug with signature parsing
Initial review fixes