Added CSMethod, bugfixes