Assignment commit. Bug fixes and enhancements