Overal fixes, built basic sanitization module, resolves #5