Second part of support for /s and /y. Fixed some stuff, too