Beta

Fixed some bugs