fix errors, additional smoke testing