Implement re-rendering
Fix up some prototype issues