Cosmin 14

Fixed some bugs