Corrected various calling codes
0.0.7