fixed misc. issues with spike