minor bugs in s