Added remaining paint and invalidate functions