Bug fixes, new object creation in logic fixed