bug fixes, added experiment numbering, added fake markers
making things work in simulation, testing reload.. more work to do