6/26

got rid of callocs in s.c
