Real minor changes

Please remember to remove #include <cstdlib> and the memory leaky thing.