Revert "bug fixes and added more finch stuff"

This reverts commit cd69e6f80eeac813ede44a597fb3900014672a85.