add: Two helpers
fix: Some edge condition issues.
format