Fixed bugs - complete experiment ready to run