fixes and enhs