fixing bunch of issues with object handler