some extra objects  and small fixes