snorby support, several code cleanup efforts.