Revert "Revert "bug fixes and added more finch stuff""

This reverts commit 74dbf7703eb7491a242819bdaa41b9118e72bd74.