Addresses handling in fornt office + minor fixes