merge with goa-tz
little debugging, code styling