A bit of cleanup and renaming
fix Proxy idiocy
Update Entity