Re-implanted objects, cleaned up main a bit