-cleaned code (took out all the comments I was working with)

-worked fixing rectangle listener issue