Server fixes
Client Fixes
Inherits improved