Alpha 4.0

Fixed some bugs