Fixed up the onClick listeners and added comments to my methods