more salms work

working on cleaning up code for new functionality to be implemented in
the coming weeks