Fixed startup errors
Fixed sanitizing text in helpers
Fixed merge