moved adding of listeners in builder (fixed #15)
minor improvements