spike work and bug fixes