Modulo in markButtonUp now works. Small changes in the other classes