some bugfixes; no system.$ for object as it breaks code