Fixes And additions