Issues corrected V0.3

Corrected some bugs