Updated v3

Fixed a few things