some minor fixes and added disabled status