Ready for scenario

Fixed all known issues.