Update experiments and bug fixes

Fixed two bugs found by the Fingbug!! Very cool.