Fixed bug and added thank you message