More updates and better version handling.. ish