minor aesthetic changes
added fluidsub, test failing
added fluidsub, test failing
added Smith method
merge conflict