Updated viperfish and fixed a few issues arising