add return object; fix small issues