fixes and enhancements by simran