Bug fixes

fixing an issue where clicking next repeatedly caused problems