New features and enhancements

Fixed bugs