fixed stuff that broke
Merge pull request #268 from projectcs13/sp9.sc3.fixed_stuff_that_broke

fixed stuff that broke